spinner: Behave like any other icon
authorBenjamin Otte <otte@redhat.com>
Thu, 17 Jun 2021 10:53:01 +0000 (12:53 +0200)
committerBenjamin Otte <otte@redhat.com>
Thu, 17 Jun 2021 10:54:56 +0000 (12:54 +0200)
Take the size from -gtk-icon-size.

Note that min-width/height still works, as those properties are handled
by the generic widget sizing machinery in GTK4.

gtk/gtkspinner.c

index 0c21c0c5ef827025ac66e51ff3d955f85e549119..163911552d62630c81ae17c6657012b078ef9504 100644 (file)
@@ -91,20 +91,10 @@ gtk_spinner_measure (GtkWidget      *widget,
                      int            *minimum_baseline,
                      int            *natural_baseline)
 {
-  double min_size;
   GtkCssStyle *style;
 
   style = gtk_css_node_get_style (gtk_widget_get_css_node (widget));
-
-  if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    min_size = _gtk_css_number_value_get (style->size->min_width, 100);
-  else
-    min_size = _gtk_css_number_value_get (style->size->min_height, 100);
-
-  if (min_size > 0.0)
-    *minimum = *natural = min_size;
-  else
-    *minimum = *natural = DEFAULT_SIZE;
+  *minimum = *natural = _gtk_css_number_value_get (style->icon->icon_size, 100);
 }
 
 static void